From 764b163ce6f83796eaad7b24ca3f173b45695198 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 14 Feb 2004 02:00:40 +0000 Subject: [PATCH] Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist the very 2004-02-13 Federico Mena Quintero * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist the very first time you try to save one. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilesystemunix.c | 10 ++++++++-- 6 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c3655c9ff..b6b7c557b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-13 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): + Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist + the very first time you try to save one. + 2004-02-13 Federico Mena Quintero Fix #129020. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0c3655c9ff..b6b7c557b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-02-13 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): + Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist + the very first time you try to save one. + 2004-02-13 Federico Mena Quintero Fix #129020. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0c3655c9ff..b6b7c557b5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-02-13 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): + Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist + the very first time you try to save one. + 2004-02-13 Federico Mena Quintero Fix #129020. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0c3655c9ff..b6b7c557b5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-02-13 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): + Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist + the very first time you try to save one. + 2004-02-13 Federico Mena Quintero Fix #129020. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0c3655c9ff..b6b7c557b5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-02-13 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_add_bookmark): + Duh, duh, duh! Don't bail out if the bookmarks file doesn't exist + the very first time you try to save one. + 2004-02-13 Federico Mena Quintero Fix #129020. diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 8d600ee12b..0117ab335f 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -1077,9 +1077,15 @@ gtk_file_system_unix_add_bookmark (GtkFileSystem *file_system, GSList *l; char *uri; gboolean result; + GError *err; - if (!bookmark_list_read (&bookmarks, error)) - return FALSE; + err = NULL; + if (!bookmark_list_read (&bookmarks, &err) && err->code != G_FILE_ERROR_NOENT) + { + g_propagate_error (error, err); + g_error_free (err); + return FALSE; + } result = FALSE; -- 2.30.2